Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 16 Sep 2011 04:48:59 +0000 (21:48 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 16 Sep 2011 04:48:59 +0000 (21:48 -0700)
commit8fe59cc834df54aafac1bd2a904107e6def37b29
treec0369f4dc1c9c1e2d011c2284c547be915b99af7
parent5d61e48b6882f975a7bd96a7f640c5118beb4915
parentec3f37ca8f92e453fe12efb276f9fac7d2a29d16
Merge from trunk.